x11: Use public API to access cursor's xcursor

diff --git a/gdk/x11/gdkdevice-core.c b/gdk/x11/gdkdevice-core.c
index 6dbe9f9559b7f8e802ed8ea3df033953d2aa687a..e176f91f36fa55fdd78d883a2d7657a6722438fc 100644 (file)
--- a/gdk/x11/gdkdevice-core.c
+++ b/gdk/x11/gdkdevice-core.c
@@ -200,15 +200,12 @@ gdk_device_core_set_window_cursor (GdkDevice *device,
                                    GdkWindow *window,
                                    GdkCursor *cursor)
 {
-  GdkCursorPrivate *cursor_private;
   Cursor xcursor;
 
-  cursor_private = (GdkCursorPrivate*) cursor;
-
   if (!cursor)
     xcursor = None;
   else
-    xcursor = cursor_private->xcursor;
+    xcursor = gdk_x11_cursor_get_xcursor (cursor);
 
   XDefineCursor (GDK_WINDOW_XDISPLAY (window),
                  GDK_WINDOW_XID (window),
@@ -362,7 +359,7 @@ gdk_device_core_grab (GdkDevice    *device,
       else
         {
           _gdk_x11_cursor_update_theme (cursor);
-          xcursor = ((GdkCursorPrivate *) cursor)->xcursor;
+          xcursor = gdk_x11_cursor_get_xcursor (cursor);
         }
 
       xevent_mask = 0;

diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index df7ae1fb2bd5a1c1b2911b68d51a3166beced750..4eca8f1d29fd08c5ebfc2f97d73e5dca0251fa72 100644 (file)
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -245,7 +245,6 @@ gdk_device_xi2_set_window_cursor (GdkDevice *device,
                                   GdkCursor *cursor)
 {
   GdkDeviceXI2Private *priv;
-  GdkCursorPrivate *cursor_private;
 
   priv = GDK_DEVICE_XI2 (device)->priv;
 
@@ -255,12 +254,10 @@ gdk_device_xi2_set_window_cursor (GdkDevice *device,
 
   if (cursor)
     {
-      cursor_private = (GdkCursorPrivate*) cursor;
-
       XIDefineCursor (GDK_WINDOW_XDISPLAY (window),
                       priv->device_id,
                       GDK_WINDOW_XID (window),
-                      cursor_private->xcursor);
+                      gdk_x11_cursor_get_xcursor (cursor));
     }
   else
     XIUndefineCursor (GDK_WINDOW_XDISPLAY (window),
@@ -408,7 +405,7 @@ gdk_device_xi2_grab (GdkDevice    *device,
   else
     {
       _gdk_x11_cursor_update_theme (cursor);
-      xcursor = ((GdkCursorPrivate *) cursor)->xcursor;
+      xcursor = gdk_x11_cursor_get_xcursor (cursor);
     }
 
   mask.deviceid = priv->device_id;